From ce686683b4c4153ff740600b63a2221f67c54b32 Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Fri, 10 Nov 2006 16:45:25 -0600 Subject: [PATCH] [POWERPC][XEN] Rename "Mambo" to "systemsim". Signed-off-by: Hollis Blanchard --HG-- rename : xen/arch/powerpc/mambo.S => xen/arch/powerpc/systemsim.S extra : transplant_source : %8EB%A0%A4%0C%21%19%3E%A2%B6j%60%2B%1F%D5%19%D2%7F%BC%3D --- xen/arch/powerpc/Makefile | 2 +- xen/arch/powerpc/dart.c | 6 ++---- xen/arch/powerpc/exceptions.h | 2 -- xen/arch/powerpc/mm.c | 6 +++--- xen/arch/powerpc/{mambo.S => systemsim.S} | 14 +++++++------- xen/include/asm-powerpc/config.h | 2 +- xen/include/asm-powerpc/msr.h | 4 ++-- xen/include/asm-powerpc/powerpc64/string.h | 3 +++ xen/include/asm-powerpc/processor.h | 10 +++++----- 9 files changed, 24 insertions(+), 25 deletions(-) rename xen/arch/powerpc/{mambo.S => systemsim.S} (86%) diff --git a/xen/arch/powerpc/Makefile b/xen/arch/powerpc/Makefile index 96733d99b9..d828f0a4b4 100644 --- a/xen/arch/powerpc/Makefile +++ b/xen/arch/powerpc/Makefile @@ -22,7 +22,7 @@ obj-y += float.o obj-y += hcalls.o obj-y += iommu.o obj-y += irq.o -obj-y += mambo.o +obj-y += systemsim.o obj-y += memory.o obj-y += mm.o obj-y += mpic.o diff --git a/xen/arch/powerpc/dart.c b/xen/arch/powerpc/dart.c index 63db568503..cdb256a1ad 100644 --- a/xen/arch/powerpc/dart.c +++ b/xen/arch/powerpc/dart.c @@ -189,10 +189,8 @@ static int find_dart(struct dart_info *di) ofdn_t n; char compat[128]; - - if (on_mambo()) { - /* mambo has no dart */ - DBG("%s: Mambo does not support a dart\n", __func__); + if (on_systemsim()) { + DBG("%s: systemsim does not support a dart\n", __func__); return -1; } diff --git a/xen/arch/powerpc/exceptions.h b/xen/arch/powerpc/exceptions.h index 0ec2e76ec0..0dcc504620 100644 --- a/xen/arch/powerpc/exceptions.h +++ b/xen/arch/powerpc/exceptions.h @@ -44,8 +44,6 @@ extern void program_exception( extern long xen_hvcall_jump(struct cpu_user_regs *regs, ulong address); -extern void *mambo_memset(void *, int, ulong); -extern void *mambo_memcpy(void *, const void *, ulong); extern void sleep(void); extern void idle_loop(void); diff --git a/xen/arch/powerpc/mm.c b/xen/arch/powerpc/mm.c index d6bc94b4a5..4a0493978d 100644 --- a/xen/arch/powerpc/mm.c +++ b/xen/arch/powerpc/mm.c @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef VERBOSE #define MEM_LOG(_f, _a...) \ @@ -276,9 +277,8 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) extern void copy_page(void *dp, void *sp) { - if (on_mambo()) { - extern void *mambo_memcpy(void *,const void *,__kernel_size_t); - mambo_memcpy(dp, sp, PAGE_SIZE); + if (on_systemsim()) { + systemsim_memcpy(dp, sp, PAGE_SIZE); } else { memcpy(dp, sp, PAGE_SIZE); } diff --git a/xen/arch/powerpc/mambo.S b/xen/arch/powerpc/systemsim.S similarity index 86% rename from xen/arch/powerpc/mambo.S rename to xen/arch/powerpc/systemsim.S index d3259811ab..14e1013fb3 100644 --- a/xen/arch/powerpc/mambo.S +++ b/xen/arch/powerpc/systemsim.S @@ -20,11 +20,11 @@ #include #include -_GLOBAL(mambo_callthru) +_GLOBAL(systemsim_callthru) .long 0x000eaeb0 blr -_GLOBAL(mambo_write) +_GLOBAL(systemsim_write) mr r5, r4 mr r4, r3 li r3, 0 # Write console code @@ -32,31 +32,31 @@ _GLOBAL(mambo_write) li r6, 0 /* need to fix return value */ mflr r7 - bl _ENTRY(mambo_callthru) + bl _ENTRY(systemsim_callthru) mtlr r7 mr r3, r5 blr -_GLOBAL(mambo_memset) +_GLOBAL(systemsim_memset) mr r6, r5 mr r5, r4 mr r4, r3 li r3, 0x47 # memset /* need to fix return value */ mflr r7 - bl _ENTRY(mambo_callthru) + bl _ENTRY(systemsim_callthru) mtlr r7 mr r3, r4 blr -_GLOBAL(mambo_memcpy) +_GLOBAL(systemsim_memcpy) mr r6, r5 mr r5, r4 mr r4, r3 li r3, 0x45 # memcpy /* need to fix return value */ mflr r7 - bl _ENTRY(mambo_callthru) + bl _ENTRY(systemsim_callthru) mtlr r7 mr r3, r4 blr diff --git a/xen/include/asm-powerpc/config.h b/xen/include/asm-powerpc/config.h index b3b3671c1d..f2df6d83cc 100644 --- a/xen/include/asm-powerpc/config.h +++ b/xen/include/asm-powerpc/config.h @@ -21,7 +21,7 @@ #ifndef __PPC_CONFIG_H__ #define __PPC_CONFIG_H__ -#define CONFIG_MAMBO 1 +#define CONFIG_SYSTEMSIM 1 #define HYPERVISOR_VIRT_START 0x0 /* XXX temp hack for common/kernel.c */ diff --git a/xen/include/asm-powerpc/msr.h b/xen/include/asm-powerpc/msr.h index b0efc454ee..207e2dc70e 100644 --- a/xen/include/asm-powerpc/msr.h +++ b/xen/include/asm-powerpc/msr.h @@ -51,9 +51,9 @@ #define MSR_RI ULL(0x0000000000000002) #define MSR_LE ULL(0x0000000000000001) -/* MSR bits set on the Mambo simulator */ +/* MSR bits set on the systemsim simulator */ #define MSR_SIM ULL(0x0000000020000000) -#define MSR_MAMBO ULL(0x0000000010000000) +#define MSR_SYSTEMSIM ULL(0x0000000010000000) /* On a trap, srr1's copy of msr defines some bits as follows: */ #define MSR_TRAP_FE ULL(0x0000000000100000) /* Floating Point Exception */ diff --git a/xen/include/asm-powerpc/powerpc64/string.h b/xen/include/asm-powerpc/powerpc64/string.h index 3e8af89876..02ef66d84c 100644 --- a/xen/include/asm-powerpc/powerpc64/string.h +++ b/xen/include/asm-powerpc/powerpc64/string.h @@ -37,4 +37,7 @@ extern void * memmove(void *,const void *,__kernel_size_t); extern int memcmp(const void *,const void *,__kernel_size_t); extern void * memchr(const void *,int,__kernel_size_t); +extern void *systemsim_memset(void *, int, ulong); +extern void *systemsim_memcpy(void *, const void *, ulong); + #endif diff --git a/xen/include/asm-powerpc/processor.h b/xen/include/asm-powerpc/processor.h index 3614e248ed..8343ecee71 100644 --- a/xen/include/asm-powerpc/processor.h +++ b/xen/include/asm-powerpc/processor.h @@ -276,13 +276,13 @@ static inline unsigned mfdsisr(void) return val; } -#ifdef CONFIG_MAMBO -static inline int on_mambo(void) +#ifdef CONFIG_SYSTEMSIM +static inline int on_systemsim(void) { - return !!(mfmsr() & MSR_MAMBO); + return !!(mfmsr() & MSR_SYSTEMSIM); } -#else /* CONFIG_MAMBO */ -static inline int on_mambo(void) { return 0; } +#else /* CONFIG_SYSTEMSIM */ +static inline int on_systemsim(void) { return 0; } #endif #endif /* __ASSEMBLY__ */ -- 2.30.2